From 686be60df6498d44cf52f2e141d624793b8511f4 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= <mgrabovsky@yahoo.com>
Date: Mon, 26 May 2014 17:11:00 +0200
Subject: [PATCH] Support GENDER in MediaWiki:Blockip and Special:Block

Bug: 50572
Change-Id: I5ec10407bf40c0f0b189c97e9c2663796d71a91e
---
 RELEASE-NOTES-1.24        | 1 +
 includes/SkinTemplate.php | 1 +
 languages/i18n/cs.json    | 4 ++--
 languages/i18n/en.json    | 4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/RELEASE-NOTES-1.24 b/RELEASE-NOTES-1.24
index 3683fccc30..e16e411562 100644
--- a/RELEASE-NOTES-1.24
+++ b/RELEASE-NOTES-1.24
@@ -59,6 +59,7 @@ production.
   than in a dedicated pane in the preferences panel.
 
 === Bug fixes in 1.24 ===
+* (bug 50572) MediaWiki:Blockip should support gender
 * (bug 49116) Footer copyright notice is now always displayed in user language
   rather than content language (same as copyright notice for editing interface).
 * (bug 62258) A bug was fixed in File::getUnscaledThumb when a height
diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 86bd9797a9..32c25b8771 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -1316,6 +1316,7 @@ class SkinTemplate extends Skin {
 
 			if ( $this->getUser()->isAllowed( 'block' ) ) {
 				$nav_urls['blockip'] = array(
+					'text' => $this->msg( 'blockip', $rootUser )->text(),
 					'href' => self::makeSpecialUrlSubpage( 'Block', $rootUser )
 				);
 			}
diff --git a/languages/i18n/cs.json b/languages/i18n/cs.json
index cb3d5a967d..e6ba483ab5 100644
--- a/languages/i18n/cs.json
+++ b/languages/i18n/cs.json
@@ -1934,7 +1934,7 @@
 	"autoblockid": "Autoblok #$1",
 	"block": "Zablokovat uživatele",
 	"unblock": "Odblokovat uživatele",
-	"blockip": "Zablokovat uživatele",
+	"blockip": "Zablokovat {{GENDER:$1|uživatele|uživatelku}}",
 	"blockip-legend": "Zablokovat uživatele",
 	"blockiptext": "Tento formulář slouží k zablokování editací z konkrétní IP adresy nebo uživatelského jména.\nToto by mělo být používáno jen v souladu s [[{{MediaWiki:Policy-url}}|pravidly]].\nUdejte přesný důvod níže (například ocitujte, které stránky byly poškozeny).",
 	"ipaddressorusername": "IP adresa nebo uživatelské jméno:",
@@ -1963,7 +1963,7 @@
 	"ipb-unblock-addr": "Odblokovat {{GENDER:$1|uživatele|uživatelku|uživatele nebo IP adresu}} $1",
 	"ipb-unblock": "Odblokovat uživatele nebo IP adresu",
 	"ipb-blocklist": "Zobrazit probíhající bloky",
-	"ipb-blocklist-contribs": "Příspěvky uživatele $1",
+	"ipb-blocklist-contribs": "Příspěvky {{GENDER:$1|uživatele|uživatelky}} $1",
 	"unblockip": "Odblokovat uživatele",
 	"unblockiptext": "Tímto formulářem je možno obnovit právo blokované IP adresy či uživatele opět přispívat do {{grammar:2sg|{{SITENAME}}}}.",
 	"ipusubmit": "Odblokovat",
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 87c76032e0..e241896365 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -2046,7 +2046,7 @@
 	"block": "Block user",
 	"unblock": "Unblock user",
 	"unblock-summary": "",
-	"blockip": "Block user",
+	"blockip": "Block {{GENDER:$1|user}}",
 	"blockip-legend": "Block user",
 	"blockiptext": "Use the form below to block write access from a specific IP address or username.\nThis should be done only to prevent vandalism, and in accordance with [[{{MediaWiki:Policy-url}}|policy]].\nFill in a specific reason below (for example, citing particular pages that were vandalized).",
 	"ipaddressorusername": "IP address or username:",
@@ -2075,7 +2075,7 @@
 	"ipb-unblock-addr": "Unblock $1",
 	"ipb-unblock": "Unblock a username or IP address",
 	"ipb-blocklist": "View existing blocks",
-	"ipb-blocklist-contribs": "Contributions for $1",
+	"ipb-blocklist-contribs": "Contributions for {{GENDER:$1|$1}}",
 	"unblockip": "Unblock user",
 	"unblockiptext": "Use the form below to restore write access to a previously blocked IP address or username.",
 	"ipusubmit": "Remove this block",
-- 
2.20.1